sync

diff --git a/ChangeLog b/ChangeLog
index 88c48a3d383cd74713aa63e94751edb2b887f5b8..b92dbee6f6e05da2166d1775f6a2cb34f4b9036c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,7 +63,6 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
          free()s.  X itself uses free() on some of the 
          malloced memory.
 
->>>>>>> 1.633
 Sat Sep 12 10:44:06 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtkfilesel.c: Maintain a list of directories like

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 88c48a3d383cd74713aa63e94751edb2b887f5b8..b92dbee6f6e05da2166d1775f6a2cb34f4b9036c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -63,7 +63,6 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
          free()s.  X itself uses free() on some of the 
          malloced memory.
 
->>>>>>> 1.633
 Sat Sep 12 10:44:06 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtkfilesel.c: Maintain a list of directories like

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 88c48a3d383cd74713aa63e94751edb2b887f5b8..b92dbee6f6e05da2166d1775f6a2cb34f4b9036c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -63,7 +63,6 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
          free()s.  X itself uses free() on some of the 
          malloced memory.
 
->>>>>>> 1.633
 Sat Sep 12 10:44:06 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtkfilesel.c: Maintain a list of directories like

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 88c48a3d383cd74713aa63e94751edb2b887f5b8..b92dbee6f6e05da2166d1775f6a2cb34f4b9036c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -63,7 +63,6 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
          free()s.  X itself uses free() on some of the 
          malloced memory.
 
->>>>>>> 1.633
 Sat Sep 12 10:44:06 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtkfilesel.c: Maintain a list of directories like

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 88c48a3d383cd74713aa63e94751edb2b887f5b8..b92dbee6f6e05da2166d1775f6a2cb34f4b9036c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -63,7 +63,6 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
          free()s.  X itself uses free() on some of the 
          malloced memory.
 
->>>>>>> 1.633
 Sat Sep 12 10:44:06 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtkfilesel.c: Maintain a list of directories like

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 88c48a3d383cd74713aa63e94751edb2b887f5b8..b92dbee6f6e05da2166d1775f6a2cb34f4b9036c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -63,7 +63,6 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
          free()s.  X itself uses free() on some of the 
          malloced memory.
 
->>>>>>> 1.633
 Sat Sep 12 10:44:06 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtkfilesel.c: Maintain a list of directories like

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 88c48a3d383cd74713aa63e94751edb2b887f5b8..b92dbee6f6e05da2166d1775f6a2cb34f4b9036c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -63,7 +63,6 @@ Mon Sep 14 21:47:35 CDT 1998 Shawn T. Amundson <amundson@gtk.org>
          free()s.  X itself uses free() on some of the 
          malloced memory.
 
->>>>>>> 1.633
 Sat Sep 12 10:44:06 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtkfilesel.c: Maintain a list of directories like